Stage 12: final polish

Co-authored-by: Cursor <cursoragent@cursor.com>
